Changing to structs.