Use class instance variables instead of class variables