Added class vars back