UPS parser refactor