Rewrites list selects to be classes - 1.1