Adding more verifications