Continue refactoring URD