refactor(traits): change trait logic to allow addons
46 files changed