Begin to add message persistence