MOD: refactor server RPC