Added ArticleCalculator and refactored code due to this change.