Feature/en 1889

Is this still a TODO? It looks like you solved the problem above with the @SerializedName annotation solution.