[Completion] Reworked UDA completion
micro-opt