Update field definitions and fix load bug