Engine Uri: code improvements