Added xbox controller support