Really they should shift them to being personal and basically change them to act as supers/DTs for an individual to use as they see fit to optimize.