Add nested form handlers