Ensure unified editClass is backward compatible