Update type map for 4.0.21