Feature/rpm ification