Update to work with rave 0.4