Add support for url and public-database