MOdified Domain model and data structure