New build -- full URL support