Adding more routing to cover all bases