Commands parent class refactoring