Add expanded list of numerics, and update hooks code to use them