Added additional field support