OCL API 2

Build: #138 failed Changes by Sunny Aggarwal.