Updates to GDF support