Use correct message factory