Some changes to implement privave message feature.