Added support for real controllers