Add support for public URL