CON-1303: Added messaging