Added possibility to add custom matcher