Changes for enterprise

Needs to be tested on staging, works on enterprise