Adding Correlator API support objects

Change-Id: Iaafcbd7daf6aa30d68386971469e79b3f19678bf
Merge "Adding Correlator API support objects"