new database model
Revert "new database model"

This reverts commit f6b9df05874eb1183eed2e5fdce18fa522abe4e3.