Updated to include Messages index