**Is your feature request related to a problem? Please describe.** Add support for intra-organization use-cases