Domain model redesign - in progress (cont.)