Improve RPM generation