Fixing environment import