Simplified files and added messages content.