[RJ-Server] Improve RJ-Com
6 files changed