Add ownership support