WIP: add map type