File access moved to DAO. Ouput modification moved to service.
Merge branch 'longpolling'