Fixed custom plugin mappings