Added more tenanted tables and predefined objects