PLA-1487 Refactoring of Popular Articles model