Introducing primitive maps, closes #2