Use STRUCT instead of bytes #631