improve-extension-api-and-pattern