DATACASS-91 - improved XML parsing & Java config