Added initial support for the Tenant Model