Updated to use `\Ndm\OAuth` and `\Ndm\JsonRpc`