Enhance upk data parser.