Added functionality to Plugin system