Rework of plugin code to be performant & VIP compliant

[ivankruchkoff]

Thanks for the CR, I'll look at it in the coming couple of days.