Get rid of env variable mapping, use config file