Fixed Dependencies for maps