Catching OCL 2.5 up