Add support for multiple owners. Left out saving to avoid conflicting patches.