Added field kind, better group one