Better prefix values management + more