Improves config, environment variable integration