Fixed Map instantiation