Added support for controller.