Map updates

See commit log for details