Move UF into spec