Updated signature pattern matching