Fixed some bugs and removed RouteBuilder