Add class member for better tree scan