Refactor class lists to use classSet