Added orgs and units for '30' and '6114'