Added the ability to change the owner