Fixed apis for UF 0.5 migration