Change Enum,Hc Grid service to generic grid service