Moving SinkCommands/DutyCommand to SinkDuty