Updated MapStorage to allow passing in an existing Map.