Add ephemeral_owner support