add revocation definition and some other modifications to definitions.