Updated plugin infrastructure to give more responsability to plugins.