Added support for bolts that delegate to other bolts