Refactored more config options, in a way to be better minimized