Moved methods from SinkCommands to SinkLibrary