Using structs instead