[artf672433] service refactoring