Making plugin mappings more dynamic