Align TPEnvironment implementation according to simplified IEnvironment