Added message_generation and message_runtime