minor changes.
Add cross share supporting.