Changed parser to use BeautifulSoup