Added trainer support