Implement Api addons (not tested)