Added support for Map properties