Add additional checks
Add support for providing a URL