Adaptation to jOOPL 2.1.x