updated for univedo 0.2.x