Refactor commands, Services base implementations