Added role matching on the service discovery