Added EDITOR and GO_BASE_VAR fields