Updated more structures to 6.0.2