Refactor for revocation