Decoupling and fixing plugin proxy