adapted UseCases
Merge pull request #1 from Zoyela/master

adapted UseCases