improve map plugin