Updates to fields and weight order