Added support for maps

Can do primative keys and arbitrary values