added field name mapping, pattern matching