Made a few enhancements to configurations