Refactored to make the dependent plugin wireup slightly easier to configure