Hi, I've just checked-in OSIS support in place of my old XML format. I've also changed the underlying DOM model from JDOM to JAXB. I'm quite excited by this because when we've finished adding the new Commentary and Dictionary support to the Sword drivers, we should start to see leaps and bounds in terms of functionallity. Joe.