Poivisional changes to support RBM