Rework SRS to support multiple clients