Refactored User/Role/Tenant hierarchy