Modify PerformanceControl to fit better into the System

Change-Id: Ia5b13ab77e9479c9936937044b5a0e60dd2a0533