Use JsonNode instead of Map