Some more refactoring. And updated the 'example' project to work with the latest version of the add-on.