-Objective rework
Revert "-Objective rework"

This reverts commit c9724bd02bfd113ac58a66a06d7c10ebd14b12e9.
* Little change in CustomRequirement API,