Adjusted addons for API changes
Merge pull request #565 from z16/4.1

Adjusted addons for API changes