OCL API 2

Build: #329 failed Changes by Sunny Aggarwal.