Stop storage of class name inside class for built-in objects - instead store device number if a device