Improve research database build