Updates to use PNG for maps