Rework after review CR-NEWSPAPER-6. Updated to comply with new API