add extensions for user defined field matching

Reviewer: @sandipshah