Final database version
A lot of stuff added