HeteroDB support