Added export method to service and repositories
Merged conflicts