Tweak package format