Added rms-compatibility