fix: use the new constructors in UDAs funcs