Refactored more settings from system-property to config.