>> Modifications for typesafe-training <<