Additional Service Tweaks