Working on trainee config enhancement