Refactor the sinks creating a OrionSink and letting the sinks extend it