Better signature detection