Added some more to the data structure for gcg