Add enforcer and Diagnostic class