Revert "Updated DB Model"

This reverts commit 40afa4522fdd183b9ca2fd44310a3500eceb00a8.