Update to rapi 0.3.x