Refactoring service base