UriBuilders enum added in place of static UriBuilder instances