Update refactoring. Add more trucks.