Added other matcher types