added class adding and searching (partly)