Added device selection support