[Upg] Add some more helpers