Final Database Version

I promise. This is the last database version