Fixing service mess - granular control between services