Added conditions for maps