GDT: Some changes