Added device class