Refactor ActionManager