New base

A few tweaks to the database structure