Refactor: removed dynamism on EnvironmentSettings
Introduced variable list