Support for addons
3.3.0