Update to include new locations in flows