added map-support