OCL API 2

Build: #694 did not complete Changes by Sunny Aggarwal.