Update to new msm rpm struct layout