Adds more field support.