[BEP-988] Implemented handling in plugins