Consolodate routes and add BI routes