Working on map to include cghub