Refactoring, adding Command() method.