changed List to Set in most classes