Update config: Update core configs, Reduce overlap