Switch config to use config variables