Change package-global variable to object attribute, to allow safety if multiple instance