Removed and added some more configurations.