Updates server to use device class completely