Adjusted addons for API changes