added a better plugin-handling