Refactored  the application into application service to separate the business / logic