Generic message handler comment added