Splitted modules. Changed Env implementation.