Right assumption. (And I think Stuart already has that functionality in progress, or at least something similar.) One issue might be how to handle models that are common to both the admin and tenant servers. I suppose it would be possible for the same model to have different components based on the server.