Add support for discovering UAA