Reworked Model for EnTopology

Reworked the EnTopologyDao.