Changes for issue 76: fixed change the schema (conditional ->  op) and the enums related to it (both in the schema and java code
Changes for issue 76: fixed remaning classes, need to fix the tests
Changes for issue 76: fixed the tests
Changes for issue 76: other fixes