Variable added. Using Map instead of Environment.