new Environment representation/interface
conflict merged (was comment on my side)