More support for RPM, still not fully functional