Added additional enums and switch statement for 'this device only' situations