Further implementation of the Plugins System