added map handling