Match improvements

Added matches for the new feature.