Sets in class definitions replaced with Lists for performance