Complete implementation of first round Map support