Added @JsonProperty annotations.
Split method in two.