Simplified the db schema