moved plugin tuple to ADT
fixed the CPU usage issue