Add original and refactored MagicNumber finder