Add basic submission handling code