Adapt to addon format