Improved shutdown handling
Function added at correct location
Added client and company routes