Refactoring of assistance service