Database structure update

Bugfix