Added support for xbox controller