Changed Store properties to return weak references