Tweaked service definitions