POC - added OCL query