ActivityLog refactored