Generic changes to Performance project