#578 working on addons code