Added device classes