Updated PokemonTrainer