Added legacy field support.