Still adapting to rmcommon 2.2