Moved Business Logic into own Service