Improved device-specific config