Changes to handle URL