Improved device selection