Add NONE constant
Reformat trainer group data