Refactor upgrade scripts and config, Teamplated searches, Plugins