Further improved the Credential Class code