Add selectors for RPC and GEM