Merge field enhancements