Added device type to device selectors.