helper file to support multi-tenancy for server
updated to support multi-tenancy