Fix output model and route