Adding verification checks