reverted from class back to type to enable multi-tenancy on a single
server