Updated for Numbers dev changes
Updated for Numbers changes to Value management