Moved more settings into Config class