Database restructured