Convert built-in add-ins to API2

Uncategorized