Added support for controller aliases