Added more verifications.