Added message handling.