OCL API 2

Build: #274 failed Changes by Sunny Aggarwal.