#2 classes CidsAttribute and CidsClass added