Fixing up api for addons