Added support for Map-Beans