Added drafts for session handling