Add cdb-class (S4)