Services moved
Preparing for refactoring
Refactor of add method
Merge remote-tracking branch 'origin/master'