Move routing to bundle config. Replace tempting interface