Added device-specific stuff