Added BaseRouter class
fixed merge conflict