Implemented map selection.
Refactored namespaces.