FIXED: Include messages