OCL API 2

Build: #1192 failed Changes by Sunny Aggarwal.