Some quick updated to make thes plugin work with the new interface and the new output...