- Add more verification steps