We should use `Constants.CoreAnnotations` and also add the client/server address annotations to that list.