Added the possibility to differentiate sinks and senders