Adding message handling.