Fixed issue with the Service and Routes