Refactoring + new target person service