modified files for router rule support