Add OpenStack device class back in