Extension of Peak Demand Tools