new plugins and better mappings