Refactored to use Confd