Better handling of ordering structs