Added functionality to parse from URL's