RPM5 enhancements