Support Maps in ServiceBuilder