Domain model redesign - in progress