Enhance service script