Add message_controller from development