Updated the Contract classes to AsGuard master