Add rinari support