Ticket #992: modified Team and Person to hold data from khw