added map support for #360