refactoring evidence to work through directives/services