Updated the verification and Parser class