Hopefully now final version of database. Included new tables for builder.