Added more enhancements and more config options