Made changes for editor compatibility