Modified map, updated versioning.