Update mapping structs from docs