Reworking WorkDraft attributes