Added tracking instances in storage class