Switched to JsonProperty
Added order and getters