Added SubmitHandler support