Changed to a class with static variables.