added map support