Refactoring for map data type support

Change-Id: I0d258a0a04cfb1a3ef9d94b0a7a65456d5036a7d

Refactoring for map data type support

Change-Id: I0d258a0a04cfb1a3ef9d94b0a7a65456d5036a7d