Added support for changing owner