add gp_unit and referenced types