Add some verifications