- Refactor deserializer map to also use RestFormat