Solid refactor (for Pages and News)