DataContainer refactoring for #508
Slowly starting to migrate Mutant classes to the new DataToken #580