Implemented expandable map