Moved helper handler function into addon
Release 0.2.1