Updated plugin mappings