Started adding GlobalGrid support