Added additional routing functionality