Added new map typedefs