Preparation for CommandFacade refactoring