added prototype design, improved map performance