Fixed map functionality