OCL API 2

Build: #151 failed Changes by Sunny Aggarwal.