0.9: Domain object model refactoring.