Adding support for boxed numbers