We have multiple WaBa account linked within an org. Currently there is no way to arrange custom fields / attributes. We drive lots of bot logics with these custom fields / attributes. For team it is really tough to manage them.