Domain model fixes