changes to unport mapping