Added more validations for draft mode