Updated service script