Added some controller support