Refactor to use new nomenklatura client lib