Rewrite of rules/filters/dependencies to use DI