Added support for MAP type.