Add RPC classes to common (untested)