Changed message storage format