Added Affiliation and Similarity classes