There is no practical reason to keep add-ons and traits separated. We should simplify maintenance moving add-ons into traits.