Update with new MM pkg format