added support for controllers