Reworking class parser - Bibl.