Add option to select map type + refactoring