Better support for backward and forward add-on API support