Moved away from using class attribute