added match support and method specific logging