Updated paths to use config vars