Added caching to improve the performance
Moved the Archive_data text
Merge branch 'develop'