Add correct structure of the database