User story 2
Simplify service