Use url builder instead of hardcoded urls