Make UDs more immutable like