Improve adding plugins