Extended OCP and Objective classes to support extended functions.

This is code generation related, only.