Values management almost finished