Migrated to the new Connection Strategies Model