Basic map generation and better namespace structure