Sync with new MM package format