Refactor watchDraftAndUpdateState