Moved environment to core