Update to rapi 0.4.x