Added NA's change to persist messages