Use struct from groveller rather than own definition