Controller added with associated ControllerEnums interface. Small edits
to Timer.