Updated for map editor changes, which added server and client map instances.