refactor for OF addon format