Adapted RI to changed API (v 0.8).