Adapting everything to jOOPL 2.2.x