Minor structure changes in the database, database moved to version 3