Better route type
Fixed compilation errors