Refactoring base commands