Update to CLASS_STRUCTURE