Add handling of remaining json-serializable primitives