Final changes for orgs import