Modified to work with config.py