Number detection enhanced