Moved matching functions to separated file under dispatcher