Plugins architecture improve