Fix strict errors on static calls
Add AddOn management