UAA hooks added