Improve the plugins interface