Changes in ManageEnvironment for lesser database accesses.