Updates for system performance, parameter control and scenario added