Added message and weather types