Refactor Holmes services