Added WIF checking