Better DOI handling