Consider extending match