Refined package support for Mac