added Message Collection and renamed messageModel (again)