Update to use Fields directly