Replaced class variable with module instance variable