Add conditions checking for record fields