Added (number?) and (boolean?) primitives