Minor modifications on global vars for extensibility