Add parsing of references