Updated Message model