Changing gfac framework to coop with new gfac service