Improve doc, method signatures and Plugins behavior