Added drafts for file, auth and captcha support