Added onwership tracking enhacement from Daniel