Make service discovery an option