LPS-51656

Alternate implementation that uses joins instead of lookups, and updates to include both sites and roles