Refine field parsing