Added a more humane way to override RPC components