Add Omni Performance Control

This goes along wit the commit in Gerrit.