OCL API 2

Build: #1197 failed Changes by Sunny Aggarwal.