include legacy fields in Resolve output for backwards compatibility