Added individual message adaptor & XML