Adding the ability to specify the service via query param