Use singleton instance variable instead of class variable