More JSON Serialization Work. Supports  numbers now.