Updated addons for new API