Adding more devices to support