Added structs with short arrays, both pointer and hard coded