Added underscore
Modified URL generation to use URL objects or a string.