Adapted map plugin to new system