update schema to support more structs