Basic support for maps

Doesn't crash on map type.
Didn't know it about it. Will update my pull req.