Client update for map structs refactoring