Added support for number primitives and objects