Updated draftlaw model