Refactoring - manager view and update