adapted to UF 0.4.x (master)

Here is working with the following changes