Enhance the UAA_VERSION extraction