added map and bubbleAxis support