* further fix bugs in mutual dependencies when defining models.