Base service refactoring