Updated configurations to match some code changes