Updates to RI framework

Probably still doesn't work, though.