updated OCL utilties