Annotated Service Discovery