This hasn't been changed, and this is the main thing in this PR. It should be changed as proposed so users can configure the service type they want to use, when creating the context.