Add URL functionality and additional checks