#16 Improve UDI resource loading