Another part of refactoring to Command Design Pattern