Updated for new field names