Fixed Map to comply with unit tests