Added support for url entry instead of ID