Adjusted db schema