AD - Message and Message Manager logic added