SRS: Rework to handle multiple clients in a better way