adding support for variable match fields