CloudLogs refactoring