Bringing across changes from PerformantApp