Updated environment-core module