Improve field parsing in Server