Did some restructuring to reduce size of Map namespace