Added more mappings for GGRC models to ObjectFolder and ObjectFile