Added couple more conf vars and adjusted the code to read them