Additional Devices

Added detection for more devices