Updated service types to fix some errors