Better solution to the ownership kludge