Add MergeField support