adding device class support