Added in the devices classes