Changes on queues and terminator, to use sender and receiver queues id