Added class variables