Refactor Owner to be a property of each stream