OCL API 2

Build: #966 failed Changes by Sunny Aggarwal.