Updated field definitions