Adding group_id and org_id to last 3 remaining tables.