Update to RBV lib