Added support for cstruct