Added support for Map type