Changed gaf namespace to defines