Added more on messaging and persistence