Removed all Manager-specific objects (should be in Common)
Added TenantObject management