Added extra support for officially supported controllers