Added structure support and protected from form resubmission.