reordered db schema