Fixed versions, improved onSubmit api