Add more verifications
Update versions