Small refactorings
ArticleBuilder added