Add Builder trait and use it instead of util.Config