Porting more Map code