New domain model: initial work.
Compilation problems fixed.