Add RMS support