Revert "Revert "Added some config variables""

This reverts commit c0c09767b212dae7d5d1d7c379b505568602681f.