Refactoring: merged updates and moves