Add Rinari support