Updates to map plugin