Version 2 highlight-db structure