Refactor into Map namespace.