update for organization changes and source endpoints