Added support for Map Properties