Improvements executing the plugins