Update to Rice 2.5