Class reorganization, needed for editor