Revamp Device Class