Add navigation and map modules