Move parsing into DetailField