Adding more robust service selection