Updated for Numbers packaging changes