Trimmed to add the rpccore library