More coherent database schema