Refactored and changed owner to ownerId