Refactor for plugin downloads
Speed up!