Improve plugin store