Added detection of known numbers