Move more variables into config.py