Adaptation to new editClass