Add map support (Story #10)