Added starred match implementation