Added support for any RMS supported by PoD