Made internal ServiceBuilder API more consistent