(NC-136) Use kitchensink's utils