Redesign to single addon