ArticleBuilder refactored