Refactored Governance Controller to use only one Event Subscriber