Refactoring route table and under-pinnings