Removed 'JsonProperty' tags and changed HashMap -> Map