Rework import of libucl