Make page/piece classification rely on the content's class rather than its current serialisation format