Added the need for a controllerBlock in a System (this will handle both storage and energy later on)