Added sensible field names