More changes to get service running