Upgraded class loading to Innomatic 6.2 style
Upgraded class loading