Add support for RI command