[020] Updated message factory.