refs #1705 : Polishing the plugin...