Change service order
Update deps