Finally implemented better matchers