Some updates to the QML version of this plugin