Energy efficiency included in National Infrastructure Delivery Plan