Added feature flags for auto-location