Change DeviceSpecification to match with Client