Fix imports of collections and environments