Added bundle, scheduler, output, and exception handling