Added Controller and Mouse support