Updated auto URL Parsion