Fixed up the kind class