Fix to update environment and refactoring
Fix to update Changes