Add configuration through environment variables (+2)